libglnx porting: gs_transfer_out_value -> g_steal_pointer

It's a bit more verbose but...eh.

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 219eb2b7f270554c2255e98a9a0237be61b47f28..ded5e9769c21bd370d43e16b41010bcc886b0d35 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -155,7 +155,8 @@ ostree_parse_refspec (const char   *refspec,
 
   ret = TRUE;
 
-  gs_transfer_out_value (out_remote, &remote);
+  if (out_remote)
+    *out_remote = g_steal_pointer (&remote);
   if (out_ref != NULL)
     *out_ref = g_match_info_fetch (match, 2);
  out:
@@ -951,7 +952,8 @@ _ostree_make_temporary_symlink_at (int             tmp_dirfd,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_name, &tmpname);
+  if (out_name)
+    *out_name = g_steal_pointer (&tmpname);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 94c9f730dce13ca203ae81c718f4404c4a37766f..083c02651135e4b246c81f21dc150bfa5545873c 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -597,7 +597,8 @@ _ostree_repo_open_trusted_content_bare (OstreeRepo          *self,
       out_state->temp_filename = temp_filename;
       temp_filename = NULL;
       out_state->fd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*)ret_stream);
-      gs_transfer_out_value (out_stream, &ret_stream);
+      if (out_stream)
+        *out_stream = g_steal_pointer (&ret_stream);
     }
   *out_have_object = have_obj;
  out:
@@ -2372,7 +2373,8 @@ get_modified_xattrs (OstreeRepo                       *self,
     }
   
   ret = TRUE;
-  gs_transfer_out_value (out_xattrs, &ret_xattrs);
+  if (out_xattrs)
+    *out_xattrs = g_steal_pointer (&ret_xattrs);
  out:
   return ret;
 }
@@ -2967,7 +2969,8 @@ ostree_repo_write_mtree (OstreeRepo           *self,
     }
 
   ret = TRUE;
-  ot_transfer_out_value (out_file, &ret_file);
+  if (out_file)
+    *out_file = g_steal_pointer (&ret_file);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 39ddfda8d90f763c868b88c761a71980568a4d9c..ad4753ada98705709c15368f2a83477a61525ca4 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1437,7 +1437,8 @@ request_static_delta_superblock_sync (OtPullData  *pull_data,
     }
   
   ret = TRUE;
-  gs_transfer_out_value (out_delta_superblock, &ret_delta_superblock);
+  if (out_delta_superblock)
+    *out_delta_superblock = g_steal_pointer (&ret_delta_superblock);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
index 876c041f011ccfee04d990dedbd71a1342f9b9df..ae5b8dec422da4acff0710701f1c7f5dec5b22ca 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c
+++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
@@ -181,7 +181,8 @@ build_content_sizenames_filtered (OstreeRepo              *repo,
   g_ptr_array_sort (ret_sizenames, compare_sizenames);
 
   ret = TRUE;
-  gs_transfer_out_value (out_sizenames, &ret_sizenames);
+  if (out_sizenames)
+    *out_sizenames = g_steal_pointer (&ret_sizenames);
  out:
   return ret;
 }
@@ -296,7 +297,8 @@ _ostree_delta_compute_similar_objects (OstreeRepo                 *repo,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_modified_regfile_content, &ret_modified_regfile_content);
+  if (out_modified_regfile_content)
+    *out_modified_regfile_content = g_steal_pointer (&ret_modified_regfile_content);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index e07d493834c3bc35d5b5e8eaf39f18bb09f643e2..301ef99d4f006197f3f89a5b7403af4619124b58 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -488,7 +488,8 @@ get_unpacked_unlinked_content (OstreeRepo       *repo,
   }
 
   ret = TRUE;
-  gs_transfer_out_value (out_content, &ret_content);
+  if (out_content)
+    *out_content = g_steal_pointer (&ret_content);
  out:
   return ret;
 }
@@ -532,7 +533,8 @@ try_content_bsdiff (OstreeRepo                       *repo,
   ret_bsdiff->tmp_to = tmp_to; tmp_to = NULL;
 
   ret = TRUE;
-  gs_transfer_out_value (out_bsdiff, &ret_bsdiff);
+  if (out_bsdiff)
+    *out_bsdiff = g_steal_pointer (&ret_bsdiff);
  out:
   return ret;
 }
@@ -597,7 +599,8 @@ try_content_rollsum (OstreeRepo                       *repo,
   ret_rollsum->tmp_to = tmp_to; tmp_to = NULL;
   
   ret = TRUE;
-  gs_transfer_out_value (out_rollsum, &ret_rollsum);
+  if (out_rollsum)
+    *out_rollsum = g_steal_pointer (&ret_rollsum);
  out:
   if (matches)
     _ostree_rollsum_matches_free (matches);
@@ -1199,7 +1202,8 @@ get_fallback_headers (OstreeRepo               *self,
   ret_headers = g_variant_ref_sink (g_variant_builder_end (fallback_builder));
 
   ret = TRUE;
-  gs_transfer_out_value (out_headers, &ret_headers);
+  if (out_headers)
+    *out_headers = g_steal_pointer (&ret_headers);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
index f442343bd1db90dbdd4a0a1e8f5f1d1948a6314d..85ce317d6741f039cd18df9234ab3d6d7c57f7b8 100644 (file)
--- a/src/libostree/ostree-repo-traverse.c
+++ b/src/libostree/ostree-repo-traverse.c
@@ -503,7 +503,8 @@ ostree_repo_traverse_commit (OstreeRepo      *repo,
     goto out;
 
   ret = TRUE;
-  gs_transfer_out_value (out_reachable, &ret_reachable);
+  if (out_reachable)
+    *out_reachable = g_steal_pointer (&ret_reachable);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index a0e45c361c77eb247d3f8ab938cd4f0e100cbcde..2d6db1ffa579c3694343bb3a40389ae987570ae5 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2105,7 +2105,8 @@ enumerate_directory_allow_noent (GFile               *dirpath,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_direnum, &ret_direnum);
+  if (out_direnum)
+    *out_direnum = g_steal_pointer (&ret_direnum);
  out:
   return ret;
 }
@@ -2763,7 +2764,8 @@ query_info_for_bare_content_object (OstreeRepo      *self,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_info, &ret_info);
+  if (out_info)
+    *out_info = g_steal_pointer (&ret_info);
  out:
   return ret;
 }
@@ -4078,7 +4080,8 @@ sign_data (OstreeRepo     *self,
   ret_signature = g_mapped_file_get_bytes (signature_file);
   
   ret = TRUE;
-  gs_transfer_out_value (out_signature, &ret_signature);
+  if (out_signature)
+    *out_signature = g_steal_pointer (&ret_signature);
 out:
   if (commit_buffer)
     gpgme_data_release (commit_buffer);

diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c
index 68a184b01a9df44909c80b5563f9ea0688a1d5a6..5580ac9426d040f5c3126ee52183ed75b08d724c 100644 (file)
--- a/src/libostree/ostree-sepolicy.c
+++ b/src/libostree/ostree-sepolicy.c
@@ -450,7 +450,8 @@ ostree_sepolicy_restorecon (OstreeSePolicy    *self,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_new_label, &label);
+  if (out_new_label)
+    *out_new_label = g_steal_pointer (&label);
  out:
   return ret;
 #else

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 5779d7c85e474c70f2740ebd5efadbdcb7693dc0..5f8e42312bf7e6dbce77d307aa4dc9cdd13b4043 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -873,7 +873,8 @@ merge_configuration (OstreeSysroot         *sysroot,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_sepolicy, &sepolicy);
+  if (out_sepolicy)
+    *out_sepolicy = g_steal_pointer (&sepolicy);
  out:
   return ret;
 }

diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index b12204082d5fa57cdcf233553b693e6128f79b97..aa08838add2925267ea27af0cff9b2460bc7017d 100644 (file)
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -498,7 +498,8 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
   g_ptr_array_sort (ret_loader_configs, compare_loader_configs_for_sorting);
 
  done:
-  gs_transfer_out_value (out_loader_configs, &ret_loader_configs);
+  if (out_loader_configs)
+    *out_loader_configs = g_steal_pointer (&ret_loader_configs);
   ret = TRUE;
  out:
   return ret;
@@ -593,7 +594,8 @@ parse_origin (OstreeSysroot   *self,
     }
 
   ret = TRUE;
-  gs_transfer_out_value (out_origin, &ret_origin);
+  if (out_origin)
+    *out_origin = g_steal_pointer (&ret_origin);
  out:
   if (error)
     g_prefix_error (error, "Parsing %s: ", origin_path);
@@ -703,7 +705,8 @@ parse_deployment (OstreeSysroot       *self,
     ostree_deployment_set_origin (ret_deployment, origin);
 
   ret = TRUE;
-  gs_transfer_out_value (out_deployment, &ret_deployment);
+  if (out_deployment)
+    *out_deployment = g_steal_pointer (&ret_deployment);
  out:
   if (origin)
     g_key_file_unref (origin);
@@ -1048,7 +1051,8 @@ _ostree_sysroot_query_bootloader (OstreeSysroot     *sysroot,
     g_clear_object (&ret_loader);
 
   ret = TRUE;
-  gs_transfer_out_value (out_bootloader, &ret_loader);
+  if (out_bootloader)
+    *out_bootloader = g_steal_pointer (&ret_loader);
  out:
   return ret;
 }

diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 5b54af4ceaff83e6068eaa8ea069a62df715a181..51282f92b8fa09e88355abda431aa3b1dfc3a77f 100644 (file)
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -294,7 +294,8 @@ ostree_option_context_parse (GOptionContext *context,
         }
     }
 
-  gs_transfer_out_value (out_repo, &repo);
+  if (out_repo)
+    *out_repo = g_steal_pointer (&repo);
 
   success = TRUE;
 
@@ -375,7 +376,8 @@ ostree_admin_option_context_parse (GOptionContext *context,
         goto out;
     }
 
-  gs_transfer_out_value (out_sysroot, &sysroot);
+  if (out_sysroot)
+    *out_sysroot = g_steal_pointer (&sysroot);
 
   success = TRUE;